cast the return value of XGetWindowProperty() correctly so we don't return

2006-07-27  Michael Natterer  <mitch@imendio.com>

	* gdk/x11/gdkwindow-x11.c (gdk_window_get_type_hint): cast the
	return value of XGetWindowProperty() correctly so we don't return
	garbage type hints. Pointed out by Tommi Komulainen, patch taken
	from https://maemo.org/bugzilla/show_bug.cgi?id=724

diff --git a/ChangeLog b/ChangeLog
index 654ceb3cfe1c2d37fe4eb96e288d040bea2a063d..5d3d299382c7fe12eb1fba922101c7b7c05ed816 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-27  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_get_type_hint): cast the
+       return value of XGetWindowProperty() correctly so we don't return
+       garbage type hints. Pointed out by Tommi Komulainen, patch taken
+       from https://maemo.org/bugzilla/show_bug.cgi?id=724
+
 2006-07-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksettings.c (gtk_settings_finalize): Move the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 654ceb3cfe1c2d37fe4eb96e288d040bea2a063d..5d3d299382c7fe12eb1fba922101c7b7c05ed816 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-07-27  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_get_type_hint): cast the
+       return value of XGetWindowProperty() correctly so we don't return
+       garbage type hints. Pointed out by Tommi Komulainen, patch taken
+       from https://maemo.org/bugzilla/show_bug.cgi?id=724
+
 2006-07-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksettings.c (gtk_settings_finalize): Move the

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 87324b7d2f5f8b0fb27114718d04c5c0ec68f067..80f5ff3842c77611923296376d5d3723ab31b0cf 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2322,7 +2322,7 @@ gdk_window_get_type_hint (GdkWindow *window)
       if ((type_return == XA_ATOM) && (format_return == 32) &&
           (data) && (nitems_return == 1))
         {
-          Atom atom = (Atom) *data;
+          Atom atom = *(Atom*)data;
 
           if (atom == gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_DIALOG"))
             type = GDK_WINDOW_TYPE_HINT_DIALOG;